caddy: v2.4.3 release #10387
Merged
caddy: v2.4.3 release #10387
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Hmm... CI's failing with: My instinct is that the best way to work around this is simply to stop building the 2.3.0 image. @mholt what do you think? |
|
Sure. I don't know what that means, but we have no need for 2.3.0 anymore. |
I think it's because of the |
Correct, for our language images, we try to limit the number of OS versions they are based upon (usually max of two per distribution). So when a new OS release comes out, the older one is usually dropped.
Feel free to drop versions that you no longer support. 👍 That way they'll also drop out of the "Supported Tags" list that appears of the Docker Hub (https://github.com/docker-library/docs/tree/7d084e9d284243ad099a90ef2fbda09c9ad1e505/caddy#supported-tags-and-respective-dockerfile-links). |
hairyhenderson
force-pushed
the
caddy-v2.4.3
branch
from
da82df7
to
a8a736e
Compare
|
Finally found some time to get back to this 😓 Ok - I've removed the |
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
hairyhenderson
force-pushed
the
caddy-v2.4.3
branch
from
a8a736e
to
60cc8ae
Compare
|
You're awesome @hairyhenderson , thanks so much. |
Diff for 60cc8ae:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 18f2f4d..244b3ec 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,93 +1,47 @@
Maintainers: Dave Henderson (@hairyhenderson)
-Tags: 2.3.0-alpine
-SharedTags: 2.3.0
+Tags: 2.4.3-alpine, 2-alpine, alpine
+SharedTags: 2.4.3, 2, latest
Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: 2093c4a571bfe356447008d229195eb7063232b2
-Directory: 2.3/alpine
-
-Tags: 2.3.0-builder-alpine
-SharedTags: 2.3.0-builder
-Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
-GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: d1a09c6308adb9397a855fb7a591dd8d29240c4f
-Directory: 2.3/builder
-
-Tags: 2.3.0-builder-windowsservercore-1809
-SharedTags: 2.3.0-builder
-Architectures: windows-amd64
-GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: d1a09c6308adb9397a855fb7a591dd8d29240c4f
-Directory: 2.3/windows-builder/1809
-Constraints: windowsservercore-1809
-
-Tags: 2.3.0-builder-windowsservercore-ltsc2016
-SharedTags: 2.3.0-builder
-Architectures: windows-amd64
-GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: d1a09c6308adb9397a855fb7a591dd8d29240c4f
-Directory: 2.3/windows-builder/ltsc2016
-Constraints: windowsservercore-ltsc2016
-
-Tags: 2.3.0-windowsservercore-1809
-SharedTags: 2.3.0-windowsservercore, 2.3.0
-Architectures: windows-amd64
-GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: 2093c4a571bfe356447008d229195eb7063232b2
-Directory: 2.3/windows/1809
-Constraints: windowsservercore-1809
-
-Tags: 2.3.0-windowsservercore-ltsc2016
-SharedTags: 2.3.0-windowsservercore, 2.3.0
-Architectures: windows-amd64
-GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: 2093c4a571bfe356447008d229195eb7063232b2
-Directory: 2.3/windows/ltsc2016
-Constraints: windowsservercore-ltsc2016
-
-Tags: 2.4.2-alpine, 2-alpine, alpine
-SharedTags: 2.4.2, 2, latest
-Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
-GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: 977c552bbe252398811886356ea00d546ecd4f1e
+GitCommit: 1e2cf7dde14c0cfd3275efdd23f4700ecfc2419f
Directory: 2.4/alpine
-Tags: 2.4.2-builder-alpine, 2-builder-alpine, builder-alpine
-SharedTags: 2.4.2-builder, 2-builder, builder
+Tags: 2.4.3-builder-alpine, 2-builder-alpine, builder-alpine
+SharedTags: 2.4.3-builder, 2-builder, builder
Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: 977c552bbe252398811886356ea00d546ecd4f1e
+GitCommit: e01e0a10625f95d031411215378b5f790047d990
Directory: 2.4/builder
-Tags: 2.4.2-builder-windowsservercore-1809, 2-builder-windowsservercore-1809, builder-windowsservercore-1809
-SharedTags: 2.4.2-builder, 2-builder, builder
+Tags: 2.4.3-builder-windowsservercore-1809, 2-builder-windowsservercore-1809, builder-windowsservercore-1809
+SharedTags: 2.4.3-builder, 2-builder, builder
Architectures: windows-amd64
GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: 977c552bbe252398811886356ea00d546ecd4f1e
+GitCommit: 1e2cf7dde14c0cfd3275efdd23f4700ecfc2419f
Directory: 2.4/windows-builder/1809
Constraints: windowsservercore-1809
-Tags: 2.4.2-builder-windowsservercore-ltsc2016, 2-builder-windowsservercore-ltsc2016, builder-windowsservercore-ltsc2016
-SharedTags: 2.4.2-builder, 2-builder, builder
+Tags: 2.4.3-builder-windowsservercore-ltsc2016, 2-builder-windowsservercore-ltsc2016, builder-windowsservercore-ltsc2016
+SharedTags: 2.4.3-builder, 2-builder, builder
Architectures: windows-amd64
GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: 977c552bbe252398811886356ea00d546ecd4f1e
+GitCommit: 1e2cf7dde14c0cfd3275efdd23f4700ecfc2419f
Directory: 2.4/windows-builder/ltsc2016
Constraints: windowsservercore-ltsc2016
-Tags: 2.4.2-windowsservercore-1809, 2-windowsservercore-1809, windowsservercore-1809
-SharedTags: 2.4.2-windowsservercore, 2-windowsservercore, windowsservercore, 2.4.2, 2, latest
+Tags: 2.4.3-windowsservercore-1809, 2-windowsservercore-1809, windowsservercore-1809
+SharedTags: 2.4.3-windowsservercore, 2-windowsservercore, windowsservercore, 2.4.3, 2, latest
Architectures: windows-amd64
GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: 977c552bbe252398811886356ea00d546ecd4f1e
+GitCommit: 1e2cf7dde14c0cfd3275efdd23f4700ecfc2419f
Directory: 2.4/windows/1809
Constraints: windowsservercore-1809
-Tags: 2.4.2-windowsservercore-ltsc2016, 2-windowsservercore-ltsc2016, windowsservercore-ltsc2016
-SharedTags: 2.4.2-windowsservercore, 2-windowsservercore, windowsservercore, 2.4.2, 2, latest
+Tags: 2.4.3-windowsservercore-ltsc2016, 2-windowsservercore-ltsc2016, windowsservercore-ltsc2016
+SharedTags: 2.4.3-windowsservercore, 2-windowsservercore, windowsservercore, 2.4.3, 2, latest
Architectures: windows-amd64
GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: 977c552bbe252398811886356ea00d546ecd4f1e
+GitCommit: 1e2cf7dde14c0cfd3275efdd23f4700ecfc2419f
Directory: 2.4/windows/ltsc2016
Constraints: windowsservercore-ltsc2016
diff --git a/_bashbrew-list b/_bashbrew-list
index 2fbb5af..e676534 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -7,24 +7,15 @@ caddy:2-builder-windowsservercore-ltsc2016
caddy:2-windowsservercore
caddy:2-windowsservercore-1809
caddy:2-windowsservercore-ltsc2016
-caddy:2.3.0
-caddy:2.3.0-alpine
-caddy:2.3.0-builder
-caddy:2.3.0-builder-alpine
-caddy:2.3.0-builder-windowsservercore-1809
-caddy:2.3.0-builder-windowsservercore-ltsc2016
-caddy:2.3.0-windowsservercore
-caddy:2.3.0-windowsservercore-1809
-caddy:2.3.0-windowsservercore-ltsc2016
-caddy:2.4.2
-caddy:2.4.2-alpine
-caddy:2.4.2-builder
-caddy:2.4.2-builder-alpine
-caddy:2.4.2-builder-windowsservercore-1809
-caddy:2.4.2-builder-windowsservercore-ltsc2016
-caddy:2.4.2-windowsservercore
-caddy:2.4.2-windowsservercore-1809
-caddy:2.4.2-windowsservercore-ltsc2016
+caddy:2.4.3
+caddy:2.4.3-alpine
+caddy:2.4.3-builder
+caddy:2.4.3-builder-alpine
+caddy:2.4.3-builder-windowsservercore-1809
+caddy:2.4.3-builder-windowsservercore-ltsc2016
+caddy:2.4.3-windowsservercore
+caddy:2.4.3-windowsservercore-1809
+caddy:2.4.3-windowsservercore-ltsc2016
caddy:alpine
caddy:builder
caddy:builder-alpine
diff --git a/caddy_2.3.0-alpine/Dockerfile b/caddy_2.3.0-alpine/Dockerfile
deleted file mode 100644
index 9fcfb8a..0000000
diff --git a/caddy_2.3.0-builder-alpine/Dockerfile b/caddy_2.3.0-builder-alpine/Dockerfile
deleted file mode 100644
index 7aa8e82..0000000
diff --git a/caddy_2.3.0-builder-alpine/caddy-builder.sh b/caddy_2.3.0-builder-alpine/caddy-builder.sh
deleted file mode 100755
index cd4b699..0000000
diff --git a/caddy_2.3.0-builder-windowsservercore-1809/Dockerfile b/caddy_2.3.0-builder-windowsservercore-1809/Dockerfile
deleted file mode 100644
index 4d6bc78..0000000
diff --git a/caddy_2.3.0-builder-windowsservercore-ltsc2016/Dockerfile b/caddy_2.3.0-builder-windowsservercore-ltsc2016/Dockerfile
deleted file mode 100644
index 97e9ba1..0000000
diff --git a/caddy_2.3.0-windowsservercore-1809/Dockerfile b/caddy_2.3.0-windowsservercore-1809/Dockerfile
deleted file mode 100644
index 7b54ea5..0000000
diff --git a/caddy_2.3.0-windowsservercore-ltsc2016/Dockerfile b/caddy_2.3.0-windowsservercore-ltsc2016/Dockerfile
deleted file mode 100644
index 9524ed5..0000000
diff --git a/caddy_alpine/Dockerfile b/caddy_alpine/Dockerfile
index e6c26e6..9495349 100644
--- a/caddy_alpine/Dockerfile
+++ b/caddy_alpine/Dockerfile
@@ -13,20 +13,20 @@ RUN set -eux; \
wget -O /usr/share/caddy/index.html "https://github.com/caddyserver/dist/raw/a8ef04588bf34a9523b76794d601c6e9cb8e31d3/welcome/index.html"
# https://github.com/caddyserver/caddy/releases
-ENV CADDY_VERSION v2.4.2
+ENV CADDY_VERSION v2.4.3
RUN set -eux; \
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
- x86_64) binArch='amd64'; checksum='9d3320f829cfd26945ed417bc4cb52f79691db6dce52ebc8721d25c85a857888ae8db10ba500e1098aee92dc44a9d5fbe342b419d0736f525712746f884cf1ff' ;; \
- armhf) binArch='armv6'; checksum='72d9ac31519dafed67284671d3ed9d401807017d143b42bbdaaeba709123ead0f8082cc5223539622a0493fbbefb25f03c4a28c544ef1d5a02b5d8fcb36101de' ;; \
- armv7) binArch='armv7'; checksum='65d6d093a27e9699de35e436d5880f7c19287988cbb60429d979ffc0dc5855c0fa778879d9dffd3e6bb5e6efb3979f53d4e3466c9ec7e36c695cf938452e9dd9' ;; \
- aarch64) binArch='arm64'; checksum='2d51dc9c49d10846f8925a0185388b3a539cebba86d80a3b838d9e85e35d80d1786a8f2e519c94f10df4f763bcf0ef3127ae9fe00d940c8a5cda8405445b68a5' ;; \
- ppc64el|ppc64le) binArch='ppc64le'; checksum='df0c60f66f25441f3e4f2db0e5565fd632730e3d48ee0ecb2a5da763bde957b5774e085a623409d54b06ff0d0197f38ec2ac11d3642b58cce3eed3360b4de99a' ;; \
- s390x) binArch='s390x'; checksum='4b9ad777d515fe3ed79ba57f76e4443e95148c8b991b5e00ee04088ad0a0ad88d8e951d56b8001f9ded3c0ef29f674a1b5eaccc2a1f80121bd177aa7764e9245' ;; \
+ x86_64) binArch='amd64'; checksum='1b39843c198a56ccaf1af19edfe51ff2556d6c9081cbf52bbf8d697777af936b24e872561ca0b35aafa0c84b05c86faa4c2ccf463ffef31bb7140fd09211595c' ;; \
+ armhf) binArch='armv6'; checksum='9a1e606bbb6d965ab92b7bcae6a5b58fbffa7f9bec77be3321509e3175e18c8f9db785af40e91bc570f799ea9c44756ff0694439a0b4d30574ea50eee7854693' ;; \
+ armv7) binArch='armv7'; checksum='67c1af278bfb79daaf7a2717206b94e09ebfac433c5ce8ef2bad1e1233d626c5b57e822a0c29205b7c62561a06772f116d7dcf072ebea4b3148f0bbaa2f61f6c' ;; \
+ aarch64) binArch='arm64'; checksum='fa105a900a21f02175a1ab1ff2d0db4f171832183f231d59f265d3f728ac9ec7ff4f2b2a951dccf8f6d7a7057fc69e5670db18bd150ff5bd63df3f72c81cff39' ;; \
+ ppc64el|ppc64le) binArch='ppc64le'; checksum='71399082625f3059208e590b5d13c700757bcb077063115f26f257ab83b3c51d35eabcf70f0cfb426cb5cb59193ee15301dc2f35b22d2d23f6cf8678c84462a6' ;; \
+ s390x) binArch='s390x'; checksum='96c9bcb89fb1083c3a293ccc3568b58fc64cfcfda4983fd244a20be07b1b5e26b54bf155d0e472f035d584f1484bd17073c27a75b72adac7d3a820a616015887' ;; \
*) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;;\
esac; \
- wget -O /tmp/caddy.tar.gz "https://github.com/caddyserver/caddy/releases/download/v2.4.2/caddy_2.4.2_linux_${binArch}.tar.gz"; \
+ wget -O /tmp/caddy.tar.gz "https://github.com/caddyserver/caddy/releases/download/v2.4.3/caddy_2.4.3_linux_${binArch}.tar.gz"; \
echo "$checksum /tmp/caddy.tar.gz" | sha512sum -c; \
tar x -z -f /tmp/caddy.tar.gz -C /usr/bin caddy; \
rm -f /tmp/caddy.tar.gz; \
@@ -44,7 +44,7 @@ ENV XDG_DATA_HOME /data
VOLUME /config
VOLUME /data
-LABEL org.opencontainers.image.version=v2.4.2
+LABEL org.opencontainers.image.version=v2.4.3
LABEL org.opencontainers.image.title=Caddy
LABEL org.opencontainers.image.description="a powerful, enterprise-ready, open source web server with automatic HTTPS written in Go"
LABEL org.opencontainers.image.url=https://caddyserver.com
diff --git a/caddy_builder-alpine/Dockerfile b/caddy_builder-alpine/Dockerfile
index 6d42e58..83995fc 100644
--- a/caddy_builder-alpine/Dockerfile
+++ b/caddy_builder-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.16-alpine3.13
+FROM golang:1.16-alpine
RUN apk add --no-cache \
git \
@@ -6,7 +6,7 @@ RUN apk add --no-cache \
ENV XCADDY_VERSION v0.1.9
# Configures xcaddy to build with this version of Caddy
-ENV CADDY_VERSION v2.4.2
+ENV CADDY_VERSION v2.4.3
# Configures xcaddy to not clean up post-build (unnecessary in a container)
ENV XCADDY_SKIP_CLEANUP 1
diff --git a/caddy_builder-windowsservercore-1809/Dockerfile b/caddy_builder-windowsservercore-1809/Dockerfile
index 5fe1199..01252d5 100644
--- a/caddy_builder-windowsservercore-1809/Dockerfile
+++ b/caddy_builder-windowsservercore-1809/Dockerfile
@@ -4,7 +4,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
ENV XCADDY_VERSION v0.1.9
# Configures xcaddy to build with this version of Caddy
-ENV CADDY_VERSION v2.4.2
+ENV CADDY_VERSION v2.4.3
# Configures xcaddy to not clean up post-build (unnecessary in a container)
ENV XCADDY_SKIP_CLEANUP 1
diff --git a/caddy_builder-windowsservercore-ltsc2016/Dockerfile b/caddy_builder-windowsservercore-ltsc2016/Dockerfile
index 89f163b..006684f 100644
--- a/caddy_builder-windowsservercore-ltsc2016/Dockerfile
+++ b/caddy_builder-windowsservercore-ltsc2016/Dockerfile
@@ -4,7 +4,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
ENV XCADDY_VERSION v0.1.9
# Configures xcaddy to build with this version of Caddy
-ENV CADDY_VERSION v2.4.2
+ENV CADDY_VERSION v2.4.3
# Configures xcaddy to not clean up post-build (unnecessary in a container)
ENV XCADDY_SKIP_CLEANUP 1
diff --git a/caddy_windowsservercore-1809/Dockerfile b/caddy_windowsservercore-1809/Dockerfile
index 30185ad..0727bbe 100644
--- a/caddy_windowsservercore-1809/Dockerfile
+++ b/caddy_windowsservercore-1809/Dockerfile
@@ -16,13 +16,13 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
-OutFile "/usr/share/caddy/index.html"
# https://github.com/caddyserver/caddy/releases
-ENV CADDY_VERSION v2.4.2
+ENV CADDY_VERSION v2.4.3
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
Invoke-WebRequest \
- -Uri "https://github.com/caddyserver/caddy/releases/download/v2.4.2/caddy_2.4.2_windows_amd64.zip" \
+ -Uri "https://github.com/caddyserver/caddy/releases/download/v2.4.3/caddy_2.4.3_windows_amd64.zip" \
-OutFile "/caddy.zip"; \
- if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('8d5cf4479e471d47fd067ce2fbe34c2015a96caedab95ca042aeb633956cbc2bb89c1bc4fe6593c1f96ca58bc66b21f32caa6b099122b9d500a3902245fa5105')) { exit 1; }; \
+ if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('e4b392d1384a02863f93c0e183c50a2b28a19ccf468c186fa1524b041895c237dbb88b0dd20c13d187779c0b5f5789458c84ffbc17cd628a9fd05779eb418563')) { exit 1; }; \
Expand-Archive -Path "/caddy.zip" -DestinationPath "/" -Force; \
Remove-Item "/caddy.zip" -Force
@@ -33,7 +33,7 @@ ENV XDG_DATA_HOME c:/data
VOLUME c:/config
VOLUME c:/data
-LABEL org.opencontainers.image.version=v2.4.2
+LABEL org.opencontainers.image.version=v2.4.3
LABEL org.opencontainers.image.title=Caddy
LABEL org.opencontainers.image.description="a powerful, enterprise-ready, open source web server with automatic HTTPS written in Go"
LABEL org.opencontainers.image.url=https://caddyserver.com
diff --git a/caddy_windowsservercore-ltsc2016/Dockerfile b/caddy_windowsservercore-ltsc2016/Dockerfile
index 8cf02dd..e297841 100644
--- a/caddy_windowsservercore-ltsc2016/Dockerfile
+++ b/caddy_windowsservercore-ltsc2016/Dockerfile
@@ -16,13 +16,13 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
-OutFile "/usr/share/caddy/index.html"
# https://github.com/caddyserver/caddy/releases
-ENV CADDY_VERSION v2.4.2
+ENV CADDY_VERSION v2.4.3
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
Invoke-WebRequest \
- -Uri "https://github.com/caddyserver/caddy/releases/download/v2.4.2/caddy_2.4.2_windows_amd64.zip" \
+ -Uri "https://github.com/caddyserver/caddy/releases/download/v2.4.3/caddy_2.4.3_windows_amd64.zip" \
-OutFile "/caddy.zip"; \
- if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('8d5cf4479e471d47fd067ce2fbe34c2015a96caedab95ca042aeb633956cbc2bb89c1bc4fe6593c1f96ca58bc66b21f32caa6b099122b9d500a3902245fa5105')) { exit 1; }; \
+ if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('e4b392d1384a02863f93c0e183c50a2b28a19ccf468c186fa1524b041895c237dbb88b0dd20c13d187779c0b5f5789458c84ffbc17cd628a9fd05779eb418563')) { exit 1; }; \
Expand-Archive -Path "/caddy.zip" -DestinationPath "/" -Force; \
Remove-Item "/caddy.zip" -Force
@@ -33,7 +33,7 @@ ENV XDG_DATA_HOME c:/data
VOLUME c:/config
VOLUME c:/data
-LABEL org.opencontainers.image.version=v2.4.2
+LABEL org.opencontainers.image.version=v2.4.3
LABEL org.opencontainers.image.title=Caddy
LABEL org.opencontainers.image.description="a powerful, enterprise-ready, open source web server with automatic HTTPS written in Go"
LABEL org.opencontainers.image.url=https://caddyserver.com
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://github.com/caddyserver/caddy/releases/tag/v2.4.3
Signed-off-by: Dave Henderson dhenderson@gmail.com